Correct conflicts in previous patch.
authorAlan Mackenzie <acm@muc.de>
Thu, 3 Dec 2009 15:56:29 +0000 (15:56 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 3 Dec 2009 15:56:29 +0000 (15:56 +0000)
commit1ba69ed9829e10ffc9cde75308938a03918b3ece
treed45f24d5f6e9aa54a6e839c4a06519f3fe01af10
parent58d956effb5188de080bac085a53b4fa21b82472
Correct conflicts in previous patch.
lisp/ChangeLog